diff --git a/_data/merchants.yml b/_data/merchants.yml
index ce3bfe73..979eb876 100644
--- a/_data/merchants.yml
+++ b/_data/merchants.yml
@@ -36,6 +36,10 @@
url: https://bit.ac/
- name: Premium investment and exchange services
url: https://www.kaiserex.com/
+ - name: Magnetic Exchange
+ url: https://magneticexchange.com
+ - name: ArbitrCoin
+ url: https://arbitrcoin.com
- category: Block Explorers
merchants:
- name: ChainRadar
@@ -98,6 +102,8 @@
url: https://www.californiafintech.org/plans/
- name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow
url: mailto:info@loandraw.com
+ - name: cloakVPN.com
+ url: https://cloakVPN.com
- name: Cryptostorm VPN
url: https://cryptostorm.is/
- name: Esperanto lessons from Kaja
@@ -125,7 +131,7 @@
- name: FlokiNET
url: https://flokinet.is
- name: Nerdzy Lawn Care
- url: http://http://www.nerdzy.net
+ url: http://www.nerdzy.net
- category: Goods
merchants:
- name: CryptoMercado - coffee and snacks
@@ -146,10 +152,12 @@
url: http://investmentart.org/
- name: Directvoltage
url: http://directvoltage.com
+ - name: Synntech Gaming
+ url: https://synntechgaming.com
+ - name: Elise Hawkins Nutritional Therapy
+ url: www.elisehawkinsnutritionaltherapy.com
- category: Entertainment
merchants:
- - name: Crypto Kingdom
- url: http://cryptokingdom.me
- name: MoneroDice
url: https://monerodice.net
- name: SafeDice
diff --git a/_includes/header.html b/_includes/header.html
index dda9b978..a5c2374b 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -159,4 +159,4 @@
-
\ No newline at end of file
+
diff --git a/_posts/2017-06-25-logs-for-the-Kovri-dev-meeting-held-on-2017-06-25.md b/_posts/2017-06-25-logs-for-the-Kovri-dev-meeting-held-on-2017-06-25.md
new file mode 100644
index 00000000..b28b615d
--- /dev/null
+++ b/_posts/2017-06-25-logs-for-the-Kovri-dev-meeting-held-on-2017-06-25.md
@@ -0,0 +1,215 @@
+---
+layout: post
+title: Logs for the Kovri Dev Meeting Held on 2017-06-25
+summary: Brief review of what has been completed since last meeting, creating formalized FFS process, website discussion, 96boards OpenHours showcase, and code & open tickets discussion
+tags: [dev diaries, i2p, crypto]
+author: dEBRUYNE / fluffypony
+---
+
+*June 25th, 2017*
+
+# Logs
+
+**\** 1. Greetings
+**\** 2. Brief review of what's been completed since the previous meeting
+**\** 3. Status of [96boards.org OpenHours showcase for Kovri / Monero](https://github.com/monero-project/meta/issues/46)
+**\** 4. Contributor FFS check-in / status
+**\** 5. Community's progress with addendum / revision to https://github.com/monero-project/meta/issues/63
+**\** 6. Open Meta issue review https://github.com/monero-project/meta/issues
+**\** 7. Code + ticket discussion / Q & A
+**\** 8. Any additional meeting items
+**\** 9. Confirm next meeting date/time
+**\** Tick tock, like clock work. Hello :)
+**\** Hey!
+**\** Hi
+**\** yo yo
+**\** 2. Brief review of what's been completed since the previous meeting
+**\* anonimal** typing
+**\** For me: PR review/development + collaboration across various repos, kovri-site collab, code collab with MoroccanMalinois, finished up VRP's for all monero subprojects.
+**\** 5th tranche completed http://forum.getmonero.org/9/work-in-progress/86967/anonimal-s-kovri-full-time-development-funding-thread?page=&noscroll=1#post-91187
+**\** MoroccanMalinois rehrar: any words for the brief review?
+**\** Still digging in my private testnet
+**\** It's getting better, one mini baby step at a time
+**\** Awesome
+**\** hold up, sorry
+**\** Sidenote: I just now realized that our previous meeting was *two* weeks ago and not a week ago... My forum post also covers the work done between our last meeting and now.
+**\** I'm literally with endogenic right now, he's in my houes
+**\** Hi endogenic
+**\** brief review for me
+**\** lol hi anonimal :)
+**\** I finished the Monero website, so we can start identifying features we want ported to the Kovri website
+**\** with Monero website mostly done (and hopefully up soon) I will shift focus to Kovri website
+**\** so we can start having a discussion in-depth about things we want
+**\** I know I mentioned porting the FAQ tech from the Monero website to Kovri and I think it was received ok
+**\** Ok. Note: I think we should continue to try and keep as many features/ideas/bugs in the issue tracker.
+**\** will do
+**\** I'll put my web ideas up there
+**\* anonimal** same here
+**\** Ok, thanks. Anything else on 2.?
+**\ {-pigeons}** I'm going to talk with anonimal after the meeting about some questions about i2p tunnels and kovri.i2p will be up soon
+**\** Excellent :)
+**\** 3. Status of [96boards.org OpenHours showcase for Kovri / Monero](https://github.com/monero-project/meta/issues/46)
+**\** It looks like we're officially scheduled for July 20th, 16:00 UTC
+**\** I haven't seen the official confirmation email yet, and no word from FP, but I'm suspecting that we'll be go-for-launch.
+**\** I'll post details in the open issue as they come.
+**\** Anything else on 3.?
+**\** 90% sure I can make it.
+**\** Ok, I hope you'll be able to make it.
+**\** For anyone who hasn't seen an episode of openhours: https://www.youtube.com/watch?list=PL-NF6S9MM_W1QBjUc2B5Pg502bz7qslxk&v=s3nuVJmf9B0
+**\** Can we put item 5 before 4 please? :)
+**\** nah never mind forget it
+**\** 4. Contributor FFS check-in / status
+**\** As I posted above, my 5th tranche was completed several days ago. Started the new tranche with some brief SSU collab with MoroccanMalinois and related work, but was AFK yesterday.
+**\** Congratulations anonimal!!
+**\** Thanks rehrar.
+**\** MoroccanMalinois has been pumping out \ work since he took over guzzi's unfinished FFS.
+**\** :) thanks
+**\** go go MoroccanMalinois ^\_^
+**\** this kid ^^
+**\** MoroccanMalinois: any thoughts/comments on point 4.?
+**\** Nope. Maybe i should be ready for a milestone in next meeting :)
+**\** Awesome, ok.
+**\* anonimal** notes 100% fluidity in workflow from MoroccanMalinois. No snags, no conflicts, very helpful code
+**\** I don't mean to put you on the spot, I'm just trying to give a sense of your presence IMHO for the log / posterity.
+**\** Any other thoughts on 4.?
+**\** :) thanks. I enjoy how it's going on so far
+**\** Good to hear.
+**\** 5. Community's progress with addendum / revision to https://github.com/monero-project/meta/issues/63
+**\** I'm on that this week. Tomorrow actually.
+**\** I've been writing extensive documentation for the new website, and that's pretty much all done.
+**\** So I will be drafting documentation for FFS including terms, formatting, and theory.
+**\** I'll update the issue when it's done for review
+**\** Interesting. Which repo will you be working in?
+**\** Well I plan to have a Forum Funding System section in the User Guides page
+**\** http://45.32.161.183/resources/user-guides/
+**\** so I thought I'd just put it in there from the get-go, but I can start it off in the meta repo
+**\** there's already one in the meta repo
+**\** https://github.com/monero-project/meta/blob/master/FFS
+**\** So I'll probably start working in there
+**\** and then port to the User Guides once it's done
+**\** done = approved
+**\** Ok. Maybe after that's done, we can remove it from the meta repo to avoid redundancy.
+**\** Sounds good.
+**\** We'll see how it goes.
+**\** I'll use the current one as a base and get into specifics regarding licensing and community expectations
+**\** Cool, that all sounds good rehrar. Anyone else on 5.? I have not looked/worked on the document since I created this meeting item.
+**\** if there's anything that anyone thinks is important, throw it up on the issue
+**\** Moving on, 6. Open Meta issue review https://github.com/monero-project/meta/issues
+**\* anonimal** was hoping FP was around for #77, #78
+**\** Shot a message to FP regarding new Kovri logo, waiting for response
+**\** #80
+**\** Ok. pigeons rehrar do you know if we own getkovri.net?
+**\** I don't. Sec.
+**\** FP and I talked about that a looong time ago, not sure if he bought it though.
+**\** checking to see if it's taken
+**\** The monero site is getmonero.org, if you're trying for the same template.
+**\** we have the .org but he's thinking to get .net and have it redirect to .org
+**\** it's available btw, so nobody has it
+**\** moneromooo: yep. It was instinct for me to type getkovri.net because of geti2p.net
+**\** Cool. Ignore me then ^\_^
+**\** fluffypony ^ getkovri.net?
+**\** I'll find a domain name seller and ask them to take Monero
+**\** Ok
+**\* anonimal** looks through open issues
+**\** regarding https://github.com/monero-project/meta/issues/43 I will be working on an action plan this week
+**\** it will probably a Monero and Kovri hybrid
+**\** but I'll make specific sections for each
+**\** there's tons of fun ideas spinning around in my mind
+**\** I'll probably lean towards a Kovri focus since I think it needs more help than Monero
+**\** Awesome awesome. I'd love to see what you come up with.
+**\** I would get kovri.org
+**\** before it gets taken
+**\** If anyone here gets it now, I'm sure they can be reimbursed.
+**\** I'll buy. But are the domains owned by a Monero specific account that I should transfer to?
+**\** I think I can get getkovri.net
+**\** if there isn't would it be wise to have an accounts@getmonero.org type of email that the domains and other things can be attributed to? or would that be too centralized?
+**\** the Core team would have the password to it, ofc. I don't know what the current setup is.
+**\* anonimal** shrugs, all out of my jurisdiction, wishing FP was here
+**\** luigi1113: do we have a centralized accounts address?
+**\** rehrar serhack: if either of you can buy the domain now, that was be exquisite
+**\** okay
+**\** let me check
+**\* anonimal** stays out of this one
+**\** serhack, you can nab them and get reimbursed with Monero, as I know you're trying to get some more (afaik)
+**\** both getkovri.net and kovri.org if available
+**\** Just registered kovri.org
+**\** ajs: I haven't forgotten about you! https://github.com/monero-project/meta/issues/27
+**\** ArticMine is boss
+**\** Thank you ArticMine
+**\** might I suggest also .com so to have all 3 top levels for each domain name? this would aid in preventing someone setting up .com and serving malicious code or ..ect
+**\** good point
+**\** but I think kovri.com is taken
+**\** lol, actual russian kovri
+**\** Yes it is and is used in an unrelated business in Russia
+**\** it's a russian rug store
+**\** well where possible that is
+**\** I speak Russian
+**\** I can reach out to them to see their willingness to sell
+**\** can you confirm me getkovri.net ?
+**\** anonimal
+**\** ye that's the one
+**\** Huh? What do you need from me?
+**\** Yes, getkovri.net
+**\** okay, done
+**\** Yay, grazie il mio amico
+**\** ok so in Russian Ковер is a rug
+**\** :) you are trying to speak italian!! :)
+**\** and the plural is Ковры
+**\** which is Kovri in English
+**\** there is a free who-is privacy :)
+**\** So literally, for the, the site is rugs.com
+**\** Ya znaiu, rehrar
+**\** which I could imagine is a pretty premium domain for Russia
+**\** D:
+**\** anonimal: the master of all language
+**\** I was wondering about that the other day.
+**\** There was an odd "Me too" :)
+**\** anonimal starting to deanon? :D
+**\** rehrar: maybe they'll be interested in kovri software
+**\** anonimal: where can I talk with you privatly?
+**\** iDunk: ah!
+**\** irc?
+**\** at the very least, we can ask that they accpet Monero
+**\** I will purchase their rugs with Monero
+**\** serhack: for secure privacy, yes: use OTR on IRC.
+**\** rehrar: lol yes do it!
+**\** ajs: if you're around, I'll be happy to talk more about #27
+**\** serhack, if you need some help putting OTR for IRC I can show what I did
+**\** rehrar: yeah, I need some help
+**\** Thank you for helping, rehrar
+**\** alright, no worries man.
+**\** no worries other man
+**\** rehrar: what do you think of this https://github.com/monero-project/meta/issues/24
+**\** How effective do you think it would be?
+**\** I was just looking at that. I know nothing about GNU social
+**\** I'll give it some research this week
+**\** and I'll get back to you on viability and pros/cons
+**\** let's get all the issues closed :D
+**\** We had a test run a long while ago. Someone started hosting a test server but then seemed to abandon it. The service didn't catch on for our community but then again I think no one knew about it.
+**\** Ok, sounds good.
+**\** Any thoughts on #81?
+**\** needmultisig90: https://github.com/monero-project/meta/issues/81
+**\** Well, we're running out of time. Any other comments/questions about open meta issues?
+**\** Nah. Not for now.
+**\** 7. Code + ticket discussion / Q & A
+**\** MoroccanMalinois and I started a discussion around 01:00 UTC Saturday. I think we can continue anytime after the meeting.
+**\** Anything else on 7.?
+**\** 8. Any additional meeting items
+**\** rbrunner will be working on some new windows installers. I'm very happy to hear this :)
+**\** Thanks :)
+**\** Woo!
+**\** My little contribution to the revolution
+**\** I'll respond to your message a.s.a.p, rbrunner, then I think the rest will be straightforward.
+**\** By mail?
+**\** Hehe, a very welcome contribution.
+**\** Sure, just to keep continuity. Then more IRC if you're comfortable with that.
+**\** Ok.
+**\** Any other meeting items from anyone?
+**\** 9. Confirm next meeting date/time
+**\** Two weeks, same time?
+**\** No
+**\** Jk yes.
+**\** lol
+**\** haha
+**\** Ok, thanks everyone. :)
+**\** Fruitful meeting. I could taste the nectar.
\ No newline at end of file
diff --git a/_posts/2017-06-25-overview-and-logs-for-the-dev-meeting-held-on-2017-06-25.md b/_posts/2017-06-25-overview-and-logs-for-the-dev-meeting-held-on-2017-06-25.md
new file mode 100644
index 00000000..394fcb2a
--- /dev/null
+++ b/_posts/2017-06-25-overview-and-logs-for-the-dev-meeting-held-on-2017-06-25.md
@@ -0,0 +1,166 @@
+---
+layout: post
+title: Overview and Logs for the Dev Meeting Held on 2017-06-25
+summary: MyMonero/OpenMonero lightwallet support for the GUI, multisig, subaddresses, 0MQ, increasing default ring size
+tags: [dev diaries, core, crypto]
+author: dEBRUYNE / fluffypony
+---
+
+*June 25th, 2017*
+
+# Overview
+
+An overview [can be found on MoneroBase](https://monerobase.com/wiki/DevMeeting_2017-06-25).
+
+# Logs
+
+**\** I know it's a bit out of order, but I can go ahead and share what updates I have while we wait for fluffy.
+**\** please do :)
+**\** I'm pretty knackered, so I'm afraid I won't have much useful input on the other topics anyway
+**\** alright, so apart from a couple minor tweaks I still plan to do (but which are by no means necessary I think), the daemon zmq rpc server should be ready to merge pending approval. There are a few things I'd do differently were I to start again from scratch, and may go back and change later, but it's in pretty decent shape overall I think. Still a good handful of unimplemented calls, but they're mostly fill-in-the-blank and low priority imo
+**\** nice
+**\** the wallet zmq rpc client (well, not explicitly wallet-only, but for the wallet) is coming along, but not quite to that same point.
+**\** yeah I had some comments about the design at some point, but I think it something that could be discussed later
+**\** plus moo may have disliked my C++ suggestions (for a good reason)
+**\** as far as I can tell, I'll be able to get what I set out to finish finished by the end of the month as planned.
+**\** so the first cut should be able to push out when a new block is received ?
+**\** vtnerd: yeah, some of your suggestions are the things I considered doing differently, but the amount of re-doing didn't seem to be worth it short term.
+**\** im a bit concerned that there has been no new code merged and leaves us with potential for another month or so turnaround on the next iteration
+**\** so {block,tx}notify is something I'd like to have a prototype of working by end of month, but I don't think I'll have a polished solution quite then. First week of July though.
+**\** you did merge my one PR, right? it cut down on some boilerplate type specifying ...
+**\** pero: check again ;)
+**\** hadn't pushed stuff up yet because I had to do an annoying rebase
+**\** does zmq result in initial daemon sync speedup at all? or is it mainly for robustness
+**\** vtnerd: I believe so
+**\** ok, I will follow that closely, because it matters for the mymonero backend
+**\** or rather it helps the mymonero backend
+**\** how is that progressing vtnerd ?
+**\** we talk sometimes about it, since the GUi now run on android with lightwallet support, but the mymonero node tis the only node we can connect (for now)
+**\** I'll update here again some time Tuesday, by then I think I can have the wallet client stuff in good shape, giving me the rest of the week to work on notify stuffs.
+**\** your question is too open-ended - what exactly on the backend did you hope to hear about?
+**\** well i dont really know what im looking for but i see some commits from may7 have been added
+**\** lemme look and make sure I pushed pero
+**\** you did - github just says may 7 cause its the oldest of your new commits
+**\** whats the overall state ? is it soon finish, just started
+**\** the newest is from 1 hour ago
+**\** I've got a written but not completely tested method for rapid tx querying via lmdb (instead of the mysql), and a re-worked algorithm that needs polishing to reduce write blocking on mysql (faster importing)
+**\** that for mymonero vtnerd?
+**\** the x86 ASM (assembly wallet importing) is now live for about a month I think
+**\** ok so thats new stuff that can be reviewed?
+**\** none of this has been pushed to mainline
+**\** cool. cant wairt to run it myself
+**\** vtnerd: i think medusa was referring to the updates in monero daemon.
+**\** the x86 ASM stuff is closest, but I wanted to confirm that it was public domain code
+**\** but afaik that work hasn't been started yet?
+**\** pero: yeah. also, weird that the commits I had to touch up for rebase didn't get new timestamps...
+**\** right, the biggie is that I did part 2 of fireice-uk FFS for the mymonero backend
+**\** so openmonero will be the other option
+**\** vtnerd: nice!
+**\** or maybe it was part 1, I forget which. either it has been live (fluffypony would have to confirm)
+**\** it doesn
+**\** doesnt touch the existing crypto code, its all cmake magic (sorry hyc/moo) so its just a matter of some polish and reviewing licensing
+**\** theres lots more speed improvements that can be done, but it will be interesting to get feedback from people first
+**\** ric also discussed with me ways to open source the backend, but its probably a reworking that will get open sourced, not the current version
+**\** somehow the mysql dependency will have to be punted before merging into mainline
+**\** sorry for hijacing this tewinget
+**\** vtnerd: no worries, I was pretty well finished anyway :)
+**\** just hanging around to answer any questions for a bit longer before I go pass out
+**\** I mean right now my main concerns are performance and better mempool integration on the backend (not necessarily merging into mainline)
+**\** mhm
+**\** so that anyone using the newer UI stuff with the backend should have a better experience (hopefully)
+**\** Jaquee: do you want to tell us about your work ?
+**\** Well, then. Anyone else doing interesting stuff who want to let us know ? :)
+**\** sure. i've been working on adding lightwallet support to GUI. There are two PR's up already that will need some more work before they can be merged
+**\