fixed merchants, fixed meeting logs

_data/merchants.yml

@@ -80,8 +80,8 @@
       url: https://mymonero.com
     - name: Pradeep Atluri, Psychiatrist, New York
       url: http://dr.mindsci.com/
-+   - name: Web Developer - Stefanos
+    - name: Web Developer - Stefanos
-+     url: http://www.stefanosioannou.com/web-development-monero-accepted
+      url: http://www.stefanosioannou.com/web-development-monero-accepted
     - name: XMR.link OpenAlias Registry
       url: https://www.xmr.link/
     - name: XMR.to Monero to Bitcoin Payment Service

_posts/2016-08-14-overview-and-logs-for-the-dev-meeting-held-on-2016-08-14.md

@@ -27,11 +27,11 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<dEBRUYNE>** \<moneromooo> Well, assuming the pony isn't too busy with mymonero. <= he was online 20 min ago, fwiw :p  
 **\<hyc>** fixing mymonero...  
 **\<dEBRUYNE>** :-P  
-**\<alex___>** what happened to mymonero?
+**\<alex\_\_\_>** what happened to mymonero?  
 **\<hyc>** its blockchain got stuck  
-**\<alex___>** ah ok
+**\<alex\_\_\_>** ah ok  
-**\<dEBRUYNE>** alex___: \<_Telegram> \<fluffypony> there were like 6 imports running which deadlocked the database
+**\<dEBRUYNE>** alex\_\_\_: \<\_Telegram> \<fluffypony> there were like 6 imports running which deadlocked the database  
-**\<hyc>** I thought we fixed db_open to disallow more than 1 process on the DB at a time
+**\<hyc>** I thought we fixed db\_open to disallow more than 1 process on the DB at a time  
 **\<moneromooo>** Might be talking about his sql db I think.  
 **\<hyc>** ah  
 **\<hyc>** too bad. we've been working on an LMDB backend for mysql/mariadb but not much progress in a long time  
@@ -99,8 +99,8 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<fluffypony>** k  
 **\<moneromooo>** Currently, we are on HF 2, and tx version 1 is the only one that exists.  
 **\<moneromooo>** At HF 3 (september on mainnet), pretty much nothing changes.  
-**\<moneromooo>** At HF 4 (march), rct txes (v2 txes) are allowed. At HF 5 (september in a year), v1 txes are disallowed, except for sweep_unmixable.
+**\<moneromooo>** At HF 4 (march), rct txes (v2 txes) are allowed. At HF 5 (september in a year), v1 txes are disallowed, except for sweep\_unmixable.  
-**\<moneromooo>** Though the last bit (sweep_unmixable) might be unnecessary, I'm unsure.
+**\<moneromooo>** Though the last bit (sweep\_unmixable) might be unnecessary, I'm unsure.  
 **\<fluffypony>** ok  
 **\<hyc>** sounds fine  
 **\<moneromooo>** Oh, and at HF 4 (when rct txes are allowed), the coinbase gets in a single out, and is stored as rct, despite not being rct.  
@@ -147,15 +147,15 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<dEBRUYNE>** **\<tewinget>** I'm a few hours of work (I hope) away from having the wallet using zmq to talk to the daemon  
 **\<moneromooo>** He said he was starting work on getting the wallet to talk 0MQ yesterday (he'd been using python client with the daemon).  
 **\<fluffypony>** ok  
-**\<dEBRUYNE>** luigi1112: minor_version should be 3 right?
+**\<dEBRUYNE>** luigi1112: minor\_version should be 3 right?  
 **\<hyc>** yes, tewinget was asking for reviews of his branch too  
-**\<moneromooo>** I guess I should go look ^_^
+**\<moneromooo>** I guess I should go look ^\_^  
-**\<dEBRUYNE>** anyway, minergate is on "major_version":2,"minor_version":3
+**\<dEBRUYNE>** anyway, minergate is on "major\_version":2,"minor\_version":3  
 **\<dEBRUYNE>** For anyone interested, the 0MQ branch can be found here -> https://github.com/tewinget/bitmonero/tree/zmq-dev  
 **\<dEBRUYNE>** moneromooo, fluffypony, luigi1112: This is Minergate's coinbase transaction -> http://moneroblocks.info/tx/8a6f45c079da5e400632c29e6b8145fda593a44657881d6d91b232769511c8fc  
 **\<fluffypony>** ok  
 **\<dEBRUYNE>** Are there any additional meeting items?  
-**\<hyc>** quick update on 32-bit support - my blockchain_import is still running :P
+**\<hyc>** quick update on 32-bit support - my blockchain\_import is still running :P  
 **\<fluffypony>** lol  
 **\<luigi1112>** dEBRUYNE: what about other pools?  
 **\<dEBRUYNE>** lemme check  
@@ -165,7 +165,7 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<fluffypony>** there will be more review post that  
 **\<fluffypony>** oh btw moneromooo  
 **\<fluffypony>** what are your thoughts on the testnet fork dates?  
-**\<moneromooo>** I should add: along with the rct stuff, that branch has random fixes that would otherwise conflict: better output selection, no signatures stored in wallet, fixes to avoid having to run rescan_spent (I think I got them all).
+**\<moneromooo>** I should add: along with the rct stuff, that branch has random fixes that would otherwise conflict: better output selection, no signatures stored in wallet, fixes to avoid having to run rescan\_spent (I think I got them all).  
 **\<moneromooo>** I think a few days after all preliminary review + fixes are done. Then 1 day between 3 and 4, and a few days between 4 and 5 (where both tx versions are allowed).  
 **\<hyc>** moneromooo: as long as those are each in their own commits, we can still tick them off 1 by 1  
 **\<moneromooo>** They are, yes.  
@@ -175,7 +175,7 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<moneromooo>** No change there for now, but there should be.  
 **\<hyc>** can we do it this Sept HF?  
 **\<JjegrUseinob>** thank you moo and hyc. your hard work is appreciated  
-**\<dEBRUYNE>** luigi1112: All pools listed here -> https://monerohash.com/#network have "major_version":2,"minor_version":3
+**\<dEBRUYNE>** luigi1112: All pools listed here -> https://monerohash.com/#network have "major\_version":2,"minor\_version":3  
 **\<fluffypony>** ok  
 **\<fluffypony>** I think that's about it then - code review time  
 **\<moneromooo>** \<hyc> can we do it this Sept HF?  
@@ -200,7 +200,7 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<fluffypony>** JjegrUseinob: there are issues that have to be fixed  
 **\<fluffypony>** eg.  
 * fluffypony Missing key: menu.stackexchange  
-* fluffypony Liquid Exception: exit in _layouts/default.html
+* fluffypony Liquid Exception: exit in \_layouts/default.html  
 **\<fluffypony>** so I've got to fix those first  
 **\<dEBRUYNE>** \<fluffypony> JjegrUseinob: sometime next week, once dEBRUYNE has a chance <= I'll PR the logs tomorrow  
 **\<fluffypony>** planning on doing it tonight  
@@ -232,7 +232,7 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<moneromooo>** That'd be september, for v1 to be disallowed.  
 **\<gingeropolous>** someone mentioned that moving the HF date up would, in general, be good for those that need truly private currency. But I also see the benefit of sticking to schedule  
 **\<moneromooo>** Well, stuff like the new coin selection will be active as soon as it's merged, since it's wallet behavior. So there'll be some betterment already.  
-**\<moneromooo>** And transfer maps to transfer_new, too. So no more shitty dust for multi-tx.
+**\<moneromooo>** And transfer maps to transfer\_new, too. So no more shitty dust for multi-tx.  
 **\<gingeropolous>** i wanted to try and get into that code for the "find set that matches" behavior... someday.  
 **\<JjegrUseinob>** why cant we point release those improvements soon then and have ringct fork late oct or nov?  
 **\<JjegrUseinob>** for march enforcement  
@@ -253,7 +253,7 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<fluffypony>** we did say that we might adjust them at the beginning, and that we'd taper down to annual hard forks (or further apart) later on  
 **\<DaveyJones>** can we have replay attacks too? for classic  
 **\<fluffypony>** so if testnet is successful and everything is fine we can consider moving itup  
-**\<fluffypony>** *it up
+**\<fluffypony>** \*it up  
 **\<JjegrUseinob>** :  
 **\<JjegrUseinob>** :)  
 **\<hyc>** ok, that sounds fine. when we're happy with the code integrity and test phase  
@@ -298,7 +298,7 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<moneromooo>** I guess I'll do mixin 4 for HF 5 then, unless new stuff gets said.  
 **\<ArticMine>** Sounds fine to me  
 **\<hyc>** ok  
-**\<moneromooo>** As an incentive for reviewers to review, my cold wallet signing patch is now based on the ringct branch, so it can't be merged without rct being merged first ^_^
+**\<moneromooo>** As an incentive for reviewers to review, my cold wallet signing patch is now based on the ringct branch, so it can't be merged without rct being merged first ^\_^  
 **\<JjegrUseinob>** cold wallet signing patch will be a great feature. thanks mooooo  
 **\<fluffypony>** ok I fixed the stuff that was breaking on the site  
 **\<tewinget>** fluffypony: what dEBRUYNE said.  
@@ -310,10 +310,10 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<tewinget>** othe: yes, but that will be something to look at after the rest is sorted, I think.  
 **\<othe>** good  
 **\<moneromooo>** Oh, that reminds me.  
-**\<moneromooo>** The previous 0mq branch had something called net_skeleton, which was doing some middle layer ntworking stuff, but was GPL so needed replacing.
+**\<moneromooo>** The previous 0mq branch had something called net\_skeleton, which was doing some middle layer ntworking stuff, but was GPL so needed replacing.  
 **\<moneromooo>** Have you found a replacement ? Kovri uses cpp-netlib, and I was thinking using the same would be good if it fits, since more people would know, etc.  
 **\<tewinget>** I'm just using zmq...  
-**\<tewinget>** idk what he (oranjuice, I think?) was using net_skeleton for.
+**\<tewinget>** idk what he (oranjuice, I think?) was using net\_skeleton for.  
 **\<moneromooo>** Yes, that was him/her. And I dunno either :)  
 **\<othe>** i only know that theirs a license issue with that anyway  
 **\<othe>** nvm...  
@@ -324,25 +324,25 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<gingeropolous>** cause again, the lack of harmony with all these version numbers is confusing  
 **\<fluffypony>** oh  
 **\<fluffypony>** tewinget / moneromooo  
-**\<fluffypony>** net_skeleton had nothing to do with 0MQ
+**\<fluffypony>** net\_skeleton had nothing to do with 0MQ  
 **\<fluffypony>** once 0MQ is in we still have to offer a JSON RPC API, right  
 **\<fluffypony>** and that has to be able to provide TLS and simple auth  
 **\<tewinget>** \<fluffypony> once 0MQ is in we still have to offer a JSON RPC API, right  <-- err...about that  
 **\<fluffypony>** so we'd have a new helper app for JSON RPC API  
 **\<fluffypony>** tewinget: it's in the spec  
-**\<tewinget>** the zmq implementation thus far *is* a json rpc
+**\<tewinget>** the zmq implementation thus far \*is* a json rpc  
 **\<fluffypony>** no  
 **\<fluffypony>** JSON RPC API is a standard  
 **\<tewinget>** oh, right, that  
 **\<fluffypony>** http://json-rpc.org  
 **\<tewinget>** I mean, I've got it nearly identical to that standard, so it wouldn't take much doing to change it to exactly that  
 **\<fluffypony>** you're just serialising data in JSON  
-**\<tewinget>**     test_str = {
+**\<tewinget>**     test\_str = {  
-**\<tewinget>**         "request": "get_blocks_fast",
+**\<tewinget>**         "request": "get\_blocks\_fast",  
 **\<tewinget>**         "version": 1,  
 **\<tewinget>**         "message": {  
-**\<tewinget>**             "block_ids": ["418015bb9ae982a1975da7d79277c2705727a56894ba0fb246adaabb1f4632e3"],
+**\<tewinget>**             "block\_ids": ["418015bb9ae982a1975da7d79277c2705727a56894ba0fb246adaabb1f4632e3"],  
-**\<tewinget>**             "start_height": 10
+**\<tewinget>**             "start\_height": 10  
 **\<fluffypony>** the HTTP-based JSON RPC API is familiar to integrators  
 **\<tewinget>**         }  
 **\<tewinget>**     }  
@@ -351,7 +351,7 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<tewinget>** I'll just have to change it a little  
 **\<tewinget>** oh, you mean http-based  
 **\<fluffypony>** yes  
-**\<fluffypony>** that's what net_skeleton was doing
+**\<fluffypony>** that's what net\_skeleton was doing  
 **\<tewinget>** which spec do you mean, 1.0 or 2.0?  
 **\<tewinget>** because 1.0 mentions HTTP, but doesn't specify that it's necessary as part of the spec, if I'm reading it correctly.  :P  
 **\<tewinget>** that said, HTTP makes sense I suppose, just will take a bit of doing.  

_posts/2016-08-28-logs-for-the-Kovri-dev-meeting-held-on-2016-08-28.md

@@ -2,7 +2,7 @@
 layout: post
 title: Logs for the Kovri Dev Meeting Held on 2016-08-28
 summary: Brief review of what has been completed since last meeting, Kovri Logo, code & open tickets discussion
-tags: [dev diaries, i2p, crypto]**
+tags: [dev diaries, i2p, crypto]
 author: dEBRUYNE / fluffypony
 ---
 
@@ -25,7 +25,7 @@ author: dEBRUYNE / fluffypony
 **\<meeting-bot> [anonimal]** 8. Closing #27  
 **\<meeting-bot> [anonimal]** 9. Any additional meeting items  
 **\<meeting-bot> [anonimal]** 10. Confirm next meeting date/time  
-**\<meeting-bot> [anonimal]** btw, twinget, you are *all* relevant to the meeting and you *ALL* should be interested.
+**\<meeting-bot> [anonimal]** btw, twinget, you are \*all\* relevant to the meeting and you \*ALL\* should be interested.  
 **\<meeting-bot> [anonimal]** Its that kind of attitude that is preventable advancing kovri development within monero.  
 **\<fluffypony>>** +100  
 **\<meeting-bot> [anonimal]** 1. Greetings  
@@ -52,7 +52,7 @@ author: dEBRUYNE / fluffypony
 **\<meeting-bot> [anonimal]** We have a new member onbard, 'solmar'. guzzi is back with us too.  
 **\<meeting-bot> [anonimal]** rakhimov is becoming more active, all great.  
 **\<meeting-bot> [anonimal]** I hope EinMByte's travels have been well and has returned.  
-**\<meeting-bot> [solmar] hey all ;)
+**\<meeting-bot> [solmar]** hey all ;)  
 **\<meeting-bot> [anonimal]** Did I miss anything for point 2.?  
 **\<fluffypony>** well  
 **\<fluffypony>** is it worth discussing #325 now?  
@@ -92,7 +92,7 @@ author: dEBRUYNE / fluffypony
 **\<meeting-bot> [i2p-relay] {-moneromooo}** Nah, use liblber for network.  
 **\<meeting-bot> [anonimal]** fluffypony: this goes for you too, as we'll see with the remaining agenda items.  
 **\<meeting-bot> [i2p-relay] {-moneromooo}** Make us fast and secure comms!  
-**\<tewinget>** fluffypony: in the same way as with hyc, the easiest way to get me involved is something needing refactored >_>
+**\<tewinget>** fluffypony: in the same way as with hyc, the easiest way to get me involved is something needing refactored >\_>  
 **\<meeting-bot> [anonimal]** Anyone else over there have a response beside moneromooo and tewinget?  
 **\<meeting-bot> [anonimal]** If not, we should move onto other Q & A.  
 **\<meeting-bot> [fluffypony]** is this still the ticket discussion part?  
@@ -133,7 +133,7 @@ author: dEBRUYNE / fluffypony
 **\<meeting-bot> [i2p-relay] {-moneromooo}** groeg: /query NICKHERE  
 **\<meeting-bot> [fluffypony]** thanks groeg, got it  
 **\<meeting-bot> [solmar]** conveying a "veil"-ish esque style to it could be interesting, since kovri means veil in esperanto afaik  
-**\<meeting-bot> [i2p-relay] {-moneromooo}** 90 degrees, not %, of course -_-
+**\<meeting-bot> [i2p-relay] {-moneromooo}** 90 degrees, not %, of course -\_-  
 **\<meeting-bot> [fluffypony]** solmar that's pretty much what I was thinking, something along the lines of a network, but it's private  
 **\<meeting-bot> [fluffypony]** or something  
 **\<meeting-bot> [fluffypony]** doesn't have to be a "veil" in the literal sense  

_posts/2016-08-28-overview-and-logs-for-the-dev-meeting-held-on-2016-08-28.md

@@ -64,7 +64,7 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<tewinget>** sure  
 **\<tewinget>** so far, all of the daemon RPC calls pertaining to the wallet are good to go, as well as several others  
 **\<tewinget>** the wallet is good to go for using the new daemon rpc library  
-**\<tewinget>** oh, the new daemon rpc has a library, rather than just calling out to networking things directly.  >**_>**
+**\<tewinget>** oh, the new daemon rpc has a library, rather than just calling out to networking things directly.  >\*\*\_>\*\*  
 **\<tewinget>** (I only got ~1 hr sleep, minor rambling will happen)  
 **\<fluffypony>** tewinget: do you think it's PR-able now, and then subsequent updates to follow, or is it still too fast-and-loose to be used in "production"?  
 **\<tewinget>** let's see...next things I need to do are basically polish: make command line flags / parametrize port bind options, and so on.  Documentation (both code and RPC spec)  
@@ -129,7 +129,7 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<fluffypony>** gingeropolous: yeah - we can re-address that in the next 6-12 months, but at the moment it's move-it-or-lose-it  
 **\<gingeropolous>** yeah absolutely  
 **\<fluffypony>** also the schedule is pretty widely known, except for ShapeShift who we'll email and then they'll claim they have no knowledge of the update  
-**\<tewinget>** gingeropolous: plus it's technically never a no-vote fork, as if the miners get pissed off and don't want it, well, they just won't.  >**_>**
+**\<tewinget>** gingeropolous: plus it's technically never a no-vote fork, as if the miners get pissed off and don't want it, well, they just won't.  >\*\*\_>\*\*  
 **\<gingeropolous>** lol fluffypony  
 **\<fluffypony>** ok so moneromooo, your fork points are fine  
 **\<moneromooo>** So will you merge the PR then build off that, or build off my branch ?  
@@ -208,11 +208,11 @@ An overview [can be found on Hello Monero](https://hellomonero.com/article/moner
 **\<fluffypony>** that's going to happen before the bins are pushed  
 **\<fluffypony>** so if anyone has any final thoughts on that, you'd best comment on the issue, else suck it up later :-P  
 **\<fluffypony>** I'd also like us to start refactoring the parts that have CryptoNote in the name to be Monero instead  
-**\<tewinget>** something something `sed`
+**\<tewinget>** something something \`sed\`  
 **\<fluffypony>** as RingCT + several thousand commits puts us quite far beyond the reference protocol  
 **\<moneromooo>** Renaming things for the fun of it ? I'd rather not.  
 **\<moneromooo>** (in the code, I mean. I'm ok with the binaries thing)  
-**\<tewinget>** btw fluffypony, I *think* that the zmq-dev branch is PR-ready, but I'm not comfortable making that call without some testing, so if anyone would like to give it a go (testnet and mainnet are affected identically, so testnet is 100% fine for, well, testing)
+**\<tewinget>** btw fluffypony, I \*think\* that the zmq-dev branch is PR-ready, but I'm not comfortable making that call without some testing, so if anyone would like to give it a go (testnet and mainnet are affected identically, so testnet is 100% fine for, well, testing)  
 **\<ArticMine>** It simple reflects the reality of how much the code has changed from the original Cryptonote implementation  
 **\<tewinget>** as I said before, I'd like to polish it up a bit first, but that's not a blocking issue for PR-ing  
 **\<fluffypony>** tewinget: if you're of the opinion it can go into a mid-Sept code freeze / release then sure, else leave it till after the release because it's not HF worthy